From 1f42153b5cd37dbf9977474ba4c9e2483e50dad1 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 26 Jan 2010 03:10:44 +0000
Subject: [PATCH] Revert r61005, r61047 (show copyright message on special
 pages). Maybe this could be configurable and off by default, but I'd be just
 as happy with an idiosyncratic change like this being a local patch.

---
 CREDITS                   | 1 -
 RELEASE-NOTES             | 1 -
 includes/SkinTemplate.php | 8 +++++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index 768ccd10c3..71ef151cf9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -84,7 +84,6 @@ following names for their contribution to the product.
 * Jeremy Baron
 * Jidanni
 * Jimmy Xu
-* Jools Wills
 * Karun Dambietz
 * Kim Hyun-Joon
 * liangent
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b091c52c09..7daff4b4eb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -304,7 +304,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Send new password e-mail in users preference language
 * LanguageConverter now support nested using of manual convert syntax like
   "-{-{}-}-"
-* (bug 16281) Show copyright system message on special pages
 * Upload license preview now uses the API instead of action=ajax
 * (bug 7346) Add <guid> to RSS to avoid duplicates
 * (bug 19996) Added new hooks for Special:Search, which allow to further
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index d2a5781ec1..e9aac0f28b 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -423,12 +423,18 @@ class SkinTemplate extends Skin {
 
 			$tpl->setRef( 'credits', $this->credits );
 
-		} else {
+		} elseif ( isset( $oldid ) && !isset( $diff ) ) {
 			$tpl->set( 'copyright', $this->getCopyright() );
 			$tpl->set( 'viewcount', false );
 			$tpl->set( 'lastmod', false );
 			$tpl->set( 'credits', false );
 			$tpl->set( 'numberofwatchingusers', false );
+		} else {
+			$tpl->set( 'copyright', false );
+			$tpl->set( 'viewcount', false );
+			$tpl->set( 'lastmod', false );
+			$tpl->set( 'credits', false );
+			$tpl->set( 'numberofwatchingusers', false );
 		}
 		wfProfileOut( __METHOD__ . '-stuff3' );
 
-- 
2.20.1